merge with xen-unstable.hg

diff --cc xen/arch/ia64/vmx/vmx_init.c
index f0aba60d7b5d7821e3b919907af7854aa21f32aa,e9ddf5e6465571dcacd71802942dcf5916beb13f..d13118b8cf42358c82d87f2dde45320ed3a69498
--- 1/xen/arch/ia64/vmx/vmx_init.c
--- 2/xen/arch/ia64/vmx/vmx_init.c
+++ b/xen/arch/ia64/vmx/vmx_init.c
@@@ -275,9 -276,9 +275,9 @@@ static void vmx_create_event_channels(s
                for_each_vcpu(v->domain, o) {
                        p = get_vio(v->domain, o->vcpu_id);
                        o->arch.arch_vmx.xen_port = p->vp_eport =
 -                                      alloc_unbound_xen_event_channel(o, 0);
 +                                      alloc_unbound_xen_event_channel(o, 0);
-                       DPRINTK("Allocated port %d for hvm.\n",
-                               o->arch.arch_vmx.xen_port);
+                       gdprintk(XENLOG_INFO, "Allocated port %d for hvm.\n",
 -                              o->arch.arch_vmx.xen_port);
++                               o->arch.arch_vmx.xen_port);
                }
        }
  }

diff --cc xen/arch/ia64/vmx/vmx_process.c
Simple merge

diff --cc xen/arch/ia64/xen/domain.c
Simple merge

diff --cc xen/include/asm-ia64/vmx_vpd.h
Simple merge